Merge.
authorkfraser@localhost.localdomain <kfraser@localhost.localdomain>
Tue, 1 Aug 2006 17:08:01 +0000 (18:08 +0100)
committerkfraser@localhost.localdomain <kfraser@localhost.localdomain>
Tue, 1 Aug 2006 17:08:01 +0000 (18:08 +0100)

Trivial merge